You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
WhatsApp Reconnect (Ads Optimization → Automatic Events) failed at random with "Reconnect returned a different WhatsApp Business Account" for businesses that own several WABAs, even when the user re-authorised the same account every time.
Root cause: the WABA was read from debug_token as granular_scopes[whatsapp_business_management].target_ids[0]. A system-user token lists every WABA the business has shared with the app, and Meta does not keep that order stable between tokens, so the first entry only matched by luck.
Fix: read the full list of granted WABAs and match the expected WABA by membership. Connect keeps the same behaviour for a fresh signup (first grant), but now validates a client-selected wabaId against the whole list instead of the first entry.
Changes
integrations/whatsapp/src/api/auth.ts: getSharedWabaId → getSharedWabaIds, returning every granted WABA id (the single-id helper had no remaining callers).
New apps/builder/src/features/integration-whatsapp/libs/waba-grant.ts: resolveGrantedWabaId / requireGrantedWabaId with a WABA_GRANT_FAILURES map, shared by connect and reconnect so the selection rule lives in one place.
actions/reconnect.action.ts: accepts the reconnect when the existing WABA is anywhere in the grant list; still rejects when the token does not cover it.
actions/connect.action.ts: deriveSignupTargets takes the requested wabaId and uses the same helper; the separate first-entry mismatch check is removed.
Tests: whatsapp-waba-grant.test.ts (new), multi-WABA cases in whatsapp-reconnect-action.test.ts, whatsapp-connect-action-registration.test.ts, and integrations/whatsapp/__tests__/auth.test.ts.
Manual: on a business with several WABAs, press Reconnect on the WhatsApp Ads Optimization tab several times in a row — no more random "different WhatsApp Business Account" error; reconnecting with a different WABA selected still fails with that error.
Manual: fresh WhatsApp connect (single-WABA and multi-WABA business) still reaches phone-number selection.
Superseded by #1107, which landed the same fix through a stronger mechanism.
Both changes start from the same finding: an embedded-signup token's whatsapp_business_management grant can name several targets, and Meta does not keep the order stable, so reading target_ids[0] makes a valid re-authorization look like a WABA mismatch.
Where they differ:
This PR matched the expected WABA by membership in the granted list.
feat(channels): connect several pages and numbers in one flow #1107 resolves the WABA that actually owns the phone number (resolveOwningWabaId, hinted with phoneNumberIds: [existing.phoneNumberId] on reconnect), and separates a real WABA from the coexistence "shadow" node with a POST /{id}/assigned_users probe — a case membership alone cannot decide.
#1107 also removes the wabaMismatch throw on the connect path, which this PR kept and threaded a requestedWabaId into. That check was itself a failure source: the client sends an empty wabaId in coexistence mode.
Rebasing this branch onto main would replace getSharedWabaTargetIds with getSharedWabaIds and reintroduce that throw, so it is closed rather than merged. No behaviour from this PR is missing on main.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
debug_tokenasgranular_scopes[whatsapp_business_management].target_ids[0]. A system-user token lists every WABA the business has shared with the app, and Meta does not keep that order stable between tokens, so the first entry only matched by luck.wabaIdagainst the whole list instead of the first entry.Changes
integrations/whatsapp/src/api/auth.ts:getSharedWabaId→getSharedWabaIds, returning every granted WABA id (the single-id helper had no remaining callers).apps/builder/src/features/integration-whatsapp/libs/waba-grant.ts:resolveGrantedWabaId/requireGrantedWabaIdwith aWABA_GRANT_FAILURESmap, shared by connect and reconnect so the selection rule lives in one place.actions/reconnect.action.ts: accepts the reconnect when the existing WABA is anywhere in the grant list; still rejects when the token does not cover it.actions/connect.action.ts:deriveSignupTargetstakes the requestedwabaIdand uses the same helper; the separate first-entry mismatch check is removed.whatsapp-waba-grant.test.ts(new), multi-WABA cases inwhatsapp-reconnect-action.test.ts,whatsapp-connect-action-registration.test.ts, andintegrations/whatsapp/__tests__/auth.test.ts.Test plan
pnpm lintpnpm --filter builder check-types && test(402 files / 2704 tests)pnpm --filter @chatbotx.io/integration-whatsapp check-types && test(24 files / 217 tests)